a608269d542e2d86f37b4c1d6dd1bc5909ca668b,plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java,UpdateEventHandler,handleEvent,#SVNEvent#number#,147
Before Change
if (myUpdatedFiles.getGroupById(SvnStatusEnvironment.REPLACED_ID) == null) {
myUpdatedFiles.registerGroup(SvnStatusEnvironment.createFileGroup(SvnBundle.message("status.group.name.replaced"), SvnStatusEnvironment.REPLACED_ID));
}
myUpdatedFiles.getGroupById(SvnStatusEnvironment.REPLACED_ID).add(path);
} else {
myUpdatedFiles.getGroupById(FileGroup.CREATED_ID).add(path);
}
}
else if (event.getAction() == SVNEventAction.UPDATE_NONE) {
// skip it
return;
}
else if (event.getAction() == SVNEventAction.UPDATE_DELETE) {
text2 = SvnBundle.message("progress.text2.deleted", displayPath);
myUpdatedFiles.getGroupById(FileGroup.REMOVED_FROM_REPOSITORY_ID).add(path);
}
else if (event.getAction() == SVNEventAction.UPDATE_UPDATE) {
if (event.getContentsStatus() == SVNStatusType.CONFLICTED || event.getPropertiesStatus() == SVNStatusType.CONFLICTED) {
myUpdatedFiles.getGroupById(FileGroup.MERGED_WITH_CONFLICT_ID).add(path);
text2 = SvnBundle.message("progress.text2.conflicted", displayPath);
}
else if (event.getContentsStatus() == SVNStatusType.MERGED || event.getPropertiesStatus() == SVNStatusType.MERGED) {
text2 = SvnBundle.message("progres.text2.merged", displayPath);
myUpdatedFiles.getGroupById(FileGroup.MERGED_ID).add(path);
}
else if (event.getContentsStatus() == SVNStatusType.CHANGED || event.getPropertiesStatus() == SVNStatusType.CHANGED) {
text2 = SvnBundle.message("progres.text2.updated", displayPath);
myUpdatedFiles.getGroupById(FileGroup.UPDATED_ID).add(path);
}
else if (event.getContentsStatus() == SVNStatusType.UNCHANGED && event.getPropertiesStatus() == SVNStatusType.UNCHANGED) {
text2 = SvnBundle.message("progres.text2.updated", displayPath);
After Change
if (myUpdatedFiles.getGroupById(SvnStatusEnvironment.REPLACED_ID) == null) {
myUpdatedFiles.registerGroup(SvnStatusEnvironment.createFileGroup(SvnBundle.message("status.group.name.replaced"), SvnStatusEnvironment.REPLACED_ID));
}
addFileToGroup(SvnStatusEnvironment.REPLACED_ID, event);
} else {
addFileToGroup(FileGroup.CREATED_ID, event);
}
}
else if (event.getAction() == SVNEventAction.UPDATE_NONE) {
// skip it
return;
}
else if (event.getAction() == SVNEventAction.UPDATE_DELETE) {
text2 = SvnBundle.message("progress.text2.deleted", displayPath);
addFileToGroup(FileGroup.REMOVED_FROM_REPOSITORY_ID, event);
}
else if (event.getAction() == SVNEventAction.UPDATE_UPDATE) {
if (event.getContentsStatus() == SVNStatusType.CONFLICTED || event.getPropertiesStatus() == SVNStatusType.CONFLICTED) {
addFileToGroup(FileGroup.MERGED_WITH_CONFLICT_ID, event);
text2 = SvnBundle.message("progress.text2.conflicted", displayPath);
}
else if (event.getContentsStatus() == SVNStatusType.MERGED || event.getPropertiesStatus() == SVNStatusType.MERGED) {
text2 = SvnBundle.message("progres.text2.merged", displayPath);
addFileToGroup(FileGroup.MERGED_ID, event);
}
else if (event.getContentsStatus() == SVNStatusType.CHANGED || event.getPropertiesStatus() == SVNStatusType.CHANGED) {
text2 = SvnBundle.message("progres.text2.updated", displayPath);
addFileToGroup(FileGroup.UPDATED_ID, event);
}
else if (event.getContentsStatus() == SVNStatusType.UNCHANGED && event.getPropertiesStatus() == SVNStatusType.UNCHANGED) {
text2 = SvnBundle.message("progres.text2.updated", displayPath);